*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5774a76404849da07f316bc4ba3a3aae614f5015..485e9a4db836d55519d11480d080476a945676d7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1386,7 +1386,6 @@
        `verbatim' so that we don't inadvertently delete a non-existant
        directory name.
 
->>>>>>> 1.1768
 2000-11-27  Kenichi Handa  <handa@etl.go.jp>
 
        * international/characters.el: Specify cases and syntaxes for